From 75a3d0fab6576d6567ca07dc26ea9bb1fdd23407 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Timm=20B=C3=A4der?= Date: Sat, 4 Mar 2017 08:44:03 +0100 Subject: [PATCH] treeview: Use gtk_widget_measure to measure widget sizes --- gtk/gtktreeview.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c index 898d5baffc..d7de695501 100644 --- a/gtk/gtktreeview.c +++ b/gtk/gtktreeview.c @@ -2782,7 +2782,8 @@ gtk_tree_view_size_allocate (GtkWidget *widget, child_rect.width -= child->border.left + child->border.right; child_rect.height -= child->border.top + child->border.bottom; - gtk_widget_get_preferred_width (GTK_WIDGET (child->widget), &size, NULL); + gtk_widget_measure (GTK_WIDGET (child->widget), GTK_ORIENTATION_HORIZONTAL, -1, + &size, NULL, NULL, NULL); if (size > child_rect.width) { @@ -2796,9 +2797,10 @@ gtk_tree_view_size_allocate (GtkWidget *widget, child_rect.width = size; } - gtk_widget_get_preferred_height_for_width (GTK_WIDGET (child->widget), - child_rect.width, - &size, NULL); + gtk_widget_measure (GTK_WIDGET (child->widget), GTK_ORIENTATION_VERTICAL, + child_rect.width, + &size, NULL, + NULL, NULL); if (size > child_rect.height) { /* Enlarge the child, extending in both directions equally */ -- 2.30.2